From e662a99b3f668652522b72572b9018f8ce59fddc Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 2 Oct 2016 12:52:02 -0500 Subject: [PATCH] Compute version in strip-nondeterminism fix Use $(runtime_ver) and $(flavor) instead of 24.5 and emacs24. --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index f4410e74e81..9647a5be1fa 100755 --- a/debian/rules +++ b/debian/rules @@ -582,7 +582,7 @@ override_dh_strip: .PHONY: override_dh_strip_nondeterminism override_dh_strip_nondeterminism: if grep "$(flavor)-el" <(dh_listpackages); then \ - cp -a debian/emacs24-el/usr/share/emacs/24.5/lisp/version.el.gz \ + cp -a debian/$(flavor)-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz \ debian/elgz-canary; \ fi cd debian && \ @@ -598,9 +598,9 @@ override_dh_strip_nondeterminism: if grep -q "$(flavor)-el" <(dh_listpackages); then \ set -e; \ test ! debian/elgz-canary -nt \ - debian/emacs24-el/usr/share/emacs/24.5/lisp/version.el.gz; \ + debian/$(flavor)-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \ test ! debian/elgz-canary -ot \ - debian/emacs24-el/usr/share/emacs/24.5/lisp/version.el.gz; \ + debian/$(flavor)-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \ fi override_dh_testdir: -- 2.30.2